From 14aa21160eb26fa2dd96a17fa550e44f68d24cad Mon Sep 17 00:00:00 2001
From: =?utf8?q?Thibaut=20VAR=C3=88NE?= <hacks@slashdirt.org>
Date: Tue, 24 Jul 2018 12:41:16 +0200
Subject: [PATCH] phase1: use ccache wrappers for all HOSTCC/HOSTCXX uses
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
---
 phase1/master.cfg | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/phase1/master.cfg b/phase1/master.cfg
index e58209d..f06ade2 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -598,12 +598,26 @@ for target in targets:
 		description = "Remove feed symlinks",
 		command=["rm", "-rf", "package/feeds/"]))
 
+	factory.addStep(StringDownload(
+		name = "ccachecc",
+		s = '#!/bin/sh\nexec ${CCACHE} ${CCC} "$@"\n',
+		slavedest = "../ccache_cc.sh",
+		mode = 0755,
+	))
+
+	factory.addStep(StringDownload(
+		name = "ccachecxx",
+		s = '#!/bin/sh\nexec ${CCACHE} ${CCXX} "$@"\n',
+		slavedest = "../ccache_cxx.sh",
+		mode = 0755,
+	))
+
 	# feed
 	factory.addStep(ShellCommand(
 		name = "updatefeeds",
 		description = "Updating feeds",
 		command=["./scripts/feeds", "update"],
-		env = MakeEnv(),
+		env = MakeEnv(tryccache=True),
 	))
 
 	# feed
@@ -611,7 +625,7 @@ for target in targets:
 		name = "installfeeds",
 		description = "Installing feeds",
 		command=["./scripts/feeds", "install", "-a"],
-		env = MakeEnv()))
+		env = MakeEnv(tryccache=True)))
 
 	# seed config
 	factory.addStep(FileDownload(
@@ -672,20 +686,6 @@ for target in targets:
 		want_stdout = False
 	))
 
-	factory.addStep(StringDownload(
-		name = "ccachecc",
-		s = '#!/bin/sh\nexec ${CCACHE} ${CCC} "$@"\n',
-		slavedest = "../ccache_cc.sh",
-		mode = 0755,
-	))
-
-	factory.addStep(StringDownload(
-		name = "ccachecxx",
-		s = '#!/bin/sh\nexec ${CCACHE} ${CCXX} "$@"\n',
-		slavedest = "../ccache_cxx.sh",
-		mode = 0755,
-	))
-
 	# prepare tar
 	factory.addStep(ShellCommand(
 		name = "dltar",
@@ -724,7 +724,7 @@ for target in targets:
 		name = "toolchain",
 		description = "Building and installing toolchain",
 		command=["make", Interpolate("-j%(kw:jobs)s", jobs=GetNumJobs), "toolchain/install", "V=s"],
-		env = MakeEnv(),
+		env = MakeEnv(tryccache=True),
 		haltOnFailure = True
 	))
 
-- 
2.30.2